Added initial tests and map functionality