Added proper test file. Update test to be a bit more strict.