Added more unit tests - Some not working