Improve bitmap efficiency and tests

7 jobs for develop in 1 minute and 49 seconds