Fixed up one-off errors and now onto implementation
Added missing test-files