Work in progress

Added more tests