Style fixes. #96
Add more system tests. #96