Fix exercises and some code refactor. No errors in spec now