Cleanup, added render tests and README