Moved tests
Tidied makefile
Added bounce BCs