Add more unit tests - #27