Testing

Solves a lot of testing issues