Completed tests; fixed #12 @3h