Adding interfaces for testing purposes
formatting
More tests