Adding tests for real this time