Working tests; incorporated feedback