bug fixed
removed test code
bug fixed
better error message
added test
bug fixing