smarter spec tests
smarter spec tests
fix unit tests