Tests

Do not merge, used to test travis-ci integration ATM