Add proper values for tests
Move tests into its own file.