#43 Various fixes based on live interpreter testing
#43 Fixed a broken test