Sky map tests and refactoring
Small fixes