Rewritten tests and completed basic framework
Clean up