Fixed some rending and added a basic test of functionality.