Refactored and changed tests, new map stuff, air tests.

Signed-off-by: Mloc <colmohici@gmail.com>