Fixed tests
Added more detailed comments