Fixed build dependencies and ddded basic map test logic